56344960743cb3778512d0b91c2a6165736d5e86,modules/apps/forms-and-workflow/dynamic-data-mapping/dynamic-data-mapping-test/src/test/java/com/liferay/dynamic/data/mapping/util/DDMFormValuesMergerTest.java,DDMFormValuesMergerTest,testMergeTextDDMFormValues,#,113

Before Change


	public void testMergeTextDDMFormValues() {
		String text = RandomTestUtil.randomString();

		LocalizedValue textValue = new LocalizedValue();

		textValue.addString(LocaleUtil.US, text);

		DDMFormValues textFormValues = createTextDDMFormValues(
			"text", textValue);

		String newValue = RandomTestUtil.randomString();

		textValue = new LocalizedValue();

		textValue.addString(LocaleUtil.US, newValue);

		DDMFormValues newTextFormValues = createTextDDMFormValues(
			"text", textValue);

		DDMFormValues mergeFormValues = _ddmFormValuesMerger.merge(
			newTextFormValues, textFormValues);

		List<DDMFormFieldValue> ddmFormFieldValues =
			mergeFormValues.getDDMFormFieldValues();

		testValues(ddmFormFieldValues, LocaleUtil.US, newValue);
	}

	@Test

After Change



	@Test
	public void testAddMissingDDMFormFieldValue() {
		DDMForm ddmForm = DDMFormTestUtil.createDDMForm();

		ddmForm.addDDMFormField(
			DDMFormTestUtil.createTextDDMFormField(
				"text1", false, false, true));
		ddmForm.addDDMFormField(
			DDMFormTestUtil.createTextDDMFormField(
				"text2", false, false, true));

		// Existing ddm form values

		String text1StringValue = RandomTestUtil.randomString();

		LocalizedValue text1LocalizedValue =
			DDMFormValuesTestUtil.createLocalizedValue(
				text1StringValue, LocaleUtil.US);

		DDMFormFieldValue text1DDMFormFieldValue =
			DDMFormValuesTestUtil.createDDMFormFieldValue(
				"text1", text1LocalizedValue);

		DDMFormValues existingDDMFormValues = createDDMFormValues(
			ddmForm, text1DDMFormFieldValue);

		// New ddm form values

		String text2StringValue = RandomTestUtil.randomString();

		LocalizedValue text2LocalizedValue =
			DDMFormValuesTestUtil.createLocalizedValue(
				text2StringValue, LocaleUtil.US);

		DDMFormFieldValue text2DDMFormFieldValue =
			DDMFormValuesTestUtil.createDDMFormFieldValue(
				"text2", text2LocalizedValue);

		DDMFormValues newDDMFormValues = createDDMFormValues(
			ddmForm, text2DDMFormFieldValue);

		DDMFormValues mergedDDMFormValues = _ddmFormValuesMerger.merge(
			newDDMFormValues, existingDDMFormValues);

		List<DDMFormFieldValue> mergedDDMFormFieldValues =
			mergedDDMFormValues.getDDMFormFieldValues();

		Assert.assertEquals(2, mergedDDMFormFieldValues.size());

		DDMFormFieldValue mergedText1DDMFormFieldValue =
			mergedDDMFormFieldValues.get(0);

		Value mergedText1Value = mergedText1DDMFormFieldValue.getValue();

		Assert.assertEquals(
			text1StringValue, mergedText1Value.getString(LocaleUtil.US));

		DDMFormFieldValue mergedText2DDMFormFieldValue =
			mergedDDMFormFieldValues.get(1);